From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 4 Nov 2010 19:56:50 +0000 (-0400)
Subject: Backport fix for Bug#5723 from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~351
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=748bc08a3ed399490614da9dd30403db8946454c;p=emacs.git

Backport fix for Bug#5723 from trunk.
---

748bc08a3ed399490614da9dd30403db8946454c
diff --cc src/ChangeLog
index 39a331d0800,3f22a95e411..4260890d7f8
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,18 +1,18 @@@
 -2010-03-27  Chong Yidong  <cyd@stupidchicken.com>
++2010-11-04  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* process.c (Fmake_network_process): Don't apply Bug#5173 fix for
+ 	Windows.
+ 
 -2010-03-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
++2010-11-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+ 	* process.c (Fmake_network_process): Don't call turn_on_atimers around
+ 	`connect' (Bug#5723).
+ 
 -2010-03-25  Helmut Eller  <eller.helmut@gmail.com>
++2010-11-04  Helmut Eller  <eller.helmut@gmail.com>
+ 
+ 	* process.c (Fmake_network_process): Call `select' for interrupted
+ 	`connect' rather than creating new socket (Bug#5173).
+ 
  2010-11-04  Kenichi Handa  <handa@m17n.org>
  
  	* font.c (font_delete_unmatched): Check Vface_ignored_fonts.